From 95eb3a2278eb6e0cf77de295dd7079b11005bd43 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 4 May 2010 12:51:33 +0100 Subject: [PATCH] x86: Relocate boot trampoline to avoid BIOS conflicts. Fix booting through iSCSI protocol with Broadcom network cards. These boards use the option ROM feature to implement the TCP/IP stack protocol, and the iSCSI software initiator. The memory address normally used by the PMM is 0x87000 which conflicts with the memory allocation for Xen's trampoline routine, currently 0x88000. Relocating down to 0x7c000 fixes the problem. Signed-off-by: Fabio Guarneri --- xen/include/asm-x86/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 39475da1d7..fc540b6c9c 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -95,7 +95,7 @@ /* Primary stack is restricted to 8kB by guard pages. */ #define PRIMARY_STACK_SIZE 8192 -#define BOOT_TRAMPOLINE 0x88000 +#define BOOT_TRAMPOLINE 0x7c000 #define bootsym_phys(sym) \ (((unsigned long)&(sym)-(unsigned long)&trampoline_start)+BOOT_TRAMPOLINE) #define bootsym(sym) \ -- 2.30.2